bitkeeper revision 1.1159.147.1 (418657f2iOsrUkLTuEEdOxEn8lH07Q)

merge

diff --cc xen/arch/x86/irq.c
Simple merge

diff --cc xen/arch/x86/pdb-stub.c
index a1eb36b0f26b1a020e86d1e393b6aaf7f34af4c0,6d2d0c73ad94badadf70d7be6eb2251ba2b1d0bd..1d4712e407da50b52af3089de529f55ac493a08b
--- 1/xen/arch/x86/pdb-stub.c
--- 2/xen/arch/x86/pdb-stub.c
+++ b/xen/arch/x86/pdb-stub.c
@@@ -1213,9 -1213,9 +1213,9 @@@ int pdb_handle_exception(int exceptionV
      return 0;
  }
  
 -void __pdb_key_pressed(void)
 +void pdb_key_pressed(unsigned char key)
  {
-     struct pt_regs *regs = (struct pt_regs *)get_execution_context();
+     struct xen_regs *regs = (struct xen_regs *)get_execution_context();
      pdb_handle_exception(KEYPRESS_EXCEPTION, regs);
  }
  

diff --cc xen/common/keyhandler.c
index 96ac0d6bd63f234be3e1e2222750d7bc916ed408,6ca3b662103d7bd8695c768807f5289415710589..5c763d1a03c578eefbb29a843a60f15b71cc0642
--- 1/xen/common/keyhandler.c
--- 2/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@@ -50,10 -39,10 +50,10 @@@ static void show_handlers(unsigned cha
  }
  
  
 -static void dump_registers(unsigned char key, void *dev_id,
 -                           struct xen_regs *regs)
 +static void dump_registers(unsigned char key)
  {
-     struct pt_regs *regs = (struct pt_regs *)get_execution_context();
 -    extern void show_registers(struct xen_regs *regs); 
++    struct xen_regs *regs = (struct xen_regs *)get_execution_context();
 +    extern void show_registers(struct pt_regs *regs); 
      printk("'%c' pressed -> dumping registers\n", key); 
      show_registers(regs); 
  }

diff --cc xen/drivers/char/console.c
index a6a979284cf288bd648287b8a5e41103a7e3fc1f,f64a705b4d48ecb978346eee6ece491269f06abb..2199ffda37af381da9f5edc9edd46ef6ad40e11f
--- 1/xen/drivers/char/console.c
--- 2/xen/drivers/char/console.c
+++ b/xen/drivers/char/console.c
@@@ -243,9 -243,10 +243,9 @@@ static void switch_serial_input(void
                 input_str[xen_rx], opt_conswitch[0], input_str[!xen_rx]);
  }
  
- static void __serial_rx(unsigned char c, struct pt_regs *regs)
+ static void __serial_rx(unsigned char c, struct xen_regs *regs)
  {
 -    key_handler *handler;
 -    struct domain *p;
 +    struct domain *d;
  
      if ( xen_rx )
      {